From 33499491ae2879cd222dee2ee117d46192a183cc Mon Sep 17 00:00:00 2001
From: robertlipe <robertlipe@f51c46e8-681c-474f-0cfe-069cfd0219fb>
Date: Tue, 1 Oct 2013 04:32:48 +0000
Subject: [PATCH] A completely mechanical search and replace to swap the first
 argument for an xml_generic callback with a typdef that can be swapped at
 compile time.

Yes, this is a hint of things to come to reduce future bulky merges.


git-svn-id: http://gpsbabel.googlecode.com/svn/trunk@4627 f51c46e8-681c-474f-0cfe-069cfd0219fb
---
 gpsbabel/defs.h               |  2 ++
 gpsbabel/dmtlog.cc            | 32 +++++++++++++++----------------
 gpsbabel/garmin_device_xml.cc | 14 +++++++-------
 gpsbabel/glogbook.cc          | 16 ++++++++--------
 gpsbabel/google.cc            | 18 +++++++++---------
 gpsbabel/googledir.cc         |  6 +++---
 gpsbabel/gtrnctr.cc           | 36 +++++++++++++++++------------------
 gpsbabel/hiketech.cc          | 32 +++++++++++++++----------------
 gpsbabel/ignrando.cc          | 14 +++++++-------
 gpsbabel/ik3d.cc              | 10 +++++-----
 gpsbabel/jogmap.cc            |  4 ++--
 gpsbabel/kml.cc               | 16 ++++++++--------
 gpsbabel/lmx.cc               | 22 ++++++++++-----------
 gpsbabel/osm.cc               | 14 +++++++-------
 gpsbabel/pocketfms_fp.cc      | 22 ++++++++++-----------
 gpsbabel/tef_xml.cc           | 14 +++++++-------
 gpsbabel/wfff_xml.cc          | 28 +++++++++++++--------------
 gpsbabel/xmlgeneric.h         |  2 +-
 gpsbabel/xol.cc               |  8 ++++----
 gpsbabel/yahoo.cc             | 10 +++++-----
 20 files changed, 161 insertions(+), 159 deletions(-)

diff --git a/gpsbabel/defs.h b/gpsbabel/defs.h
index 16390717f..75d50d8c3 100644
--- a/gpsbabel/defs.h
+++ b/gpsbabel/defs.h
@@ -440,9 +440,11 @@ const global_trait* get_traits();
 #if NEW_STRINGS 
   typedef QString String;
   #define CSTRc(qstr) (qstr.toLatin1().constData())
+  typedef const QString& xg_string;
 #else
   #define CSTRc(qstr) (qstr)
   typedef char* String;
+  typedef const char* xg_string;
 #endif
 
 class waypoint
diff --git a/gpsbabel/dmtlog.cc b/gpsbabel/dmtlog.cc
index 94f30e93c..da91854f1 100644
--- a/gpsbabel/dmtlog.cc
+++ b/gpsbabel/dmtlog.cc
@@ -148,7 +148,7 @@ finalize_pt(waypoint* wpt)
 
 #if !ZLIB_INHIBITED
 static void
-tlog3a_xgcb_version(const char* args, const QXmlStreamAttributes* unused)
+tlog3a_xgcb_version(xg_string args, const QXmlStreamAttributes* unused)
 {
   if (strcmp(args, "1") != 0) {
     fatal(MYNAME ": Unsupported file version '%s'!\n", args);
@@ -156,12 +156,12 @@ tlog3a_xgcb_version(const char* args, const QXmlStreamAttributes* unused)
 }
 
 static void
-tlog3a_xgcb_length(const char* args, const QXmlStreamAttributes* unused)
+tlog3a_xgcb_length(xg_string args, const QXmlStreamAttributes* unused)
 {
 }
 
 static void
-tlog3a_xgcb_data(const char* args, const QXmlStreamAttributes* unused)
+tlog3a_xgcb_data(xg_string args, const QXmlStreamAttributes* unused)
 {
   int len;
   char* bin;
@@ -205,7 +205,7 @@ tlog3a_xgcb_data(const char* args, const QXmlStreamAttributes* unused)
 
 
 static void
-tlog3b_xgcb_tfna(const char* args, const QXmlStreamAttributes* unused)
+tlog3b_xgcb_tfna(xg_string args, const QXmlStreamAttributes* unused)
 {
   if (xmltrk == NULL) {
     xmltrk = route_head_alloc();
@@ -216,7 +216,7 @@ tlog3b_xgcb_tfna(const char* args, const QXmlStreamAttributes* unused)
 
 
 static void
-tlog3b_xgcb_tfdes(const char* args, const QXmlStreamAttributes* unused)
+tlog3b_xgcb_tfdes(xg_string args, const QXmlStreamAttributes* unused)
 {
   if (xmltrk == NULL) {
     xmltrk = route_head_alloc();
@@ -227,7 +227,7 @@ tlog3b_xgcb_tfdes(const char* args, const QXmlStreamAttributes* unused)
 
 
 static void
-tlog3b_xgcb_wptst(const char* args, const QXmlStreamAttributes* unused)
+tlog3b_xgcb_wptst(xg_string args, const QXmlStreamAttributes* unused)
 {
   xmlwpt = waypt_new();
   xmldatum = DATUM_WGS84;
@@ -235,7 +235,7 @@ tlog3b_xgcb_wptst(const char* args, const QXmlStreamAttributes* unused)
 
 
 static void
-tlog3b_xgcb_tptst(const char* args, const QXmlStreamAttributes* unused)
+tlog3b_xgcb_tptst(xg_string args, const QXmlStreamAttributes* unused)
 {
   xmlwpt = waypt_new();
   xmldatum = DATUM_WGS84;
@@ -243,7 +243,7 @@ tlog3b_xgcb_tptst(const char* args, const QXmlStreamAttributes* unused)
 
 
 static void
-tlog3b_xgcb_tpten(const char* args, const QXmlStreamAttributes* unused)
+tlog3b_xgcb_tpten(xg_string args, const QXmlStreamAttributes* unused)
 {
   finalize_pt(xmlwpt);
 
@@ -257,7 +257,7 @@ tlog3b_xgcb_tpten(const char* args, const QXmlStreamAttributes* unused)
 
 
 static void
-tlog3b_xgcb_wptid(const char* args, const QXmlStreamAttributes* unused)
+tlog3b_xgcb_wptid(xg_string args, const QXmlStreamAttributes* unused)
 {
   if (*args) {
     xmlwpt->shortname = xstrdup(args);
@@ -266,14 +266,14 @@ tlog3b_xgcb_wptid(const char* args, const QXmlStreamAttributes* unused)
 
 
 static void
-tlog3b_xgcb_wptdt(const char* args, const QXmlStreamAttributes* unused)
+tlog3b_xgcb_wptdt(xg_string args, const QXmlStreamAttributes* unused)
 {
   xmldatum = GPS_Lookup_Datum_Index(args);
 }
 
 
 static void
-tlog3b_xgcb_wptgr(const char* args, const QXmlStreamAttributes* unused)
+tlog3b_xgcb_wptgr(xg_string args, const QXmlStreamAttributes* unused)
 {
   if (xmlgrid != NULL) {
     if (strcmp(xmlgrid, args) == 0) {
@@ -286,35 +286,35 @@ tlog3b_xgcb_wptgr(const char* args, const QXmlStreamAttributes* unused)
 
 
 static void
-tlog3b_xgcb_wptno(const char* args, const QXmlStreamAttributes* unused)
+tlog3b_xgcb_wptno(xg_string args, const QXmlStreamAttributes* unused)
 {
   xmlNorthing = atof(args);
 }
 
 
 static void
-tlog3b_xgcb_wptea(const char* args, const QXmlStreamAttributes* unused)
+tlog3b_xgcb_wptea(xg_string args, const QXmlStreamAttributes* unused)
 {
   xmlEasting = atof(args);
 }
 
 
 static void
-tlog3b_xgcb_wptal(const char* args, const QXmlStreamAttributes* unused)
+tlog3b_xgcb_wptal(xg_string args, const QXmlStreamAttributes* unused)
 {
   xmlAltitude = atof(args);
 }
 
 
 static void
-tlog3b_xgcb_tptdt(const char* args, const QXmlStreamAttributes* unused)
+tlog3b_xgcb_tptdt(xg_string args, const QXmlStreamAttributes* unused)
 {
   xmldatum = GPS_Lookup_Datum_Index(args);
 }
 
 
 static void
-tlog3b_xgcb_wpten(const char* args, const QXmlStreamAttributes* unused)
+tlog3b_xgcb_wpten(xg_string args, const QXmlStreamAttributes* unused)
 {
   finalize_pt(xmlwpt);
   waypt_add(xmlwpt);
diff --git a/gpsbabel/garmin_device_xml.cc b/gpsbabel/garmin_device_xml.cc
index e5767c25a..84348bfce 100644
--- a/gpsbabel/garmin_device_xml.cc
+++ b/gpsbabel/garmin_device_xml.cc
@@ -38,12 +38,12 @@ static char* mountpoint, *base, *path, *ext;
 static xg_callback device_s, id_s, path_s, ext_s, base_s, dir_s;
 jmp_buf gdx_jmp_buf;
 
-void type_s(const char* args, const QXmlStreamAttributes* unused)
+void type_s(xg_string args, const QXmlStreamAttributes* unused)
 {
   type = strcmp(args, "GPSData");
 }
 
-void device_s(const char* args, const QXmlStreamAttributes* unused)
+void device_s(xg_string args, const QXmlStreamAttributes* unused)
 {
   if (my_gdx_info) {
     fatal(MYNAME ": More than one device type found in file.\n");
@@ -52,27 +52,27 @@ void device_s(const char* args, const QXmlStreamAttributes* unused)
   my_gdx_info->device_desc = xstrdup(args);
 }
 
-void id_s(const char* args, const QXmlStreamAttributes* unused)
+void id_s(xg_string args, const QXmlStreamAttributes* unused)
 {
   my_gdx_info->device_id = xstrdup(args);
 }
 
-void path_s(const char* args, const QXmlStreamAttributes* unused)
+void path_s(xg_string args, const QXmlStreamAttributes* unused)
 {
   path = xstrdup(args);
 }
 
-void ext_s(const char* args, const QXmlStreamAttributes* unused)
+void ext_s(xg_string args, const QXmlStreamAttributes* unused)
 {
   ext = xstrdup(args);
 }
 
-void base_s(const char* args, const QXmlStreamAttributes* unused)
+void base_s(xg_string args, const QXmlStreamAttributes* unused)
 {
   base = xstrdup(args);
 }
 
-void dir_s(const char* args, const QXmlStreamAttributes* unused)
+void dir_s(xg_string args, const QXmlStreamAttributes* unused)
 {
   if (type) {
     return;
diff --git a/gpsbabel/glogbook.cc b/gpsbabel/glogbook.cc
index 9d4e85240..fc7e0d0d7 100644
--- a/gpsbabel/glogbook.cc
+++ b/gpsbabel/glogbook.cc
@@ -139,44 +139,44 @@ glogbook_write(void)
   writer.writeEndElement(); // History
 }
 
-void	gl_trk_s(const char* args, const QXmlStreamAttributes* unused)
+void	gl_trk_s(xg_string args, const QXmlStreamAttributes* unused)
 {
   trk_head = route_head_alloc();
   track_add_head(trk_head);
 }
 #if 0
-void	gl_trk_ident(const char* args, const QXmlStreamAttributes* unused)
+void	gl_trk_ident(xg_string args, const QXmlStreamAttributes* unused)
 {
   trk_head->rte_name = xstrdup(args);
 }
 #endif
 
-void	gl_trk_pnt_s(const char* args, const QXmlStreamAttributes* unused)
+void	gl_trk_pnt_s(xg_string args, const QXmlStreamAttributes* unused)
 {
   wpt_tmp = waypt_new();
 }
 
-void	gl_trk_pnt_e(const char* args, const QXmlStreamAttributes* unused)
+void	gl_trk_pnt_e(xg_string args, const QXmlStreamAttributes* unused)
 {
   track_add_wpt(trk_head, wpt_tmp);
 }
 
-void	gl_trk_utc(const char* args, const QXmlStreamAttributes* unused)
+void	gl_trk_utc(xg_string args, const QXmlStreamAttributes* unused)
 {
   wpt_tmp->SetCreationTime(xml_parse_time(args));
 }
 
-void	gl_trk_lat(const char* args, const QXmlStreamAttributes* unused)
+void	gl_trk_lat(xg_string args, const QXmlStreamAttributes* unused)
 {
   wpt_tmp->latitude = atof(args);
 }
 
-void	gl_trk_long(const char* args, const QXmlStreamAttributes* unused)
+void	gl_trk_long(xg_string args, const QXmlStreamAttributes* unused)
 {
   wpt_tmp->longitude = atof(args);
 }
 
-void	gl_trk_alt(const char* args, const QXmlStreamAttributes* unused)
+void	gl_trk_alt(xg_string args, const QXmlStreamAttributes* unused)
 {
   wpt_tmp->altitude = atof(args);
 }
diff --git a/gpsbabel/google.cc b/gpsbabel/google.cc
index 0e1ca469d..98454292b 100644
--- a/gpsbabel/google.cc
+++ b/gpsbabel/google.cc
@@ -57,7 +57,7 @@ xg_tag_mapping google_map[] = {
   { NULL, (xg_cb_type)0,              NULL }
 };
 
-void goog_script(const char* args, const QXmlStreamAttributes* unused)
+void goog_script(xg_string args, const QXmlStreamAttributes* unused)
 {
   if (args) {
     if (script) {
@@ -68,7 +68,7 @@ void goog_script(const char* args, const QXmlStreamAttributes* unused)
   }
 }
 
-void goog_points(const char* args, const QXmlStreamAttributes* unused)
+void goog_points(xg_string args, const QXmlStreamAttributes* unused)
 {
   if (args) {
     if (encoded_points) {
@@ -79,7 +79,7 @@ void goog_points(const char* args, const QXmlStreamAttributes* unused)
   }
 }
 
-void goog_levels(const char* args, const QXmlStreamAttributes* unused)
+void goog_levels(xg_string args, const QXmlStreamAttributes* unused)
 {
   if (args) {
     if (encoded_levels) {
@@ -98,7 +98,7 @@ static int goog_segroute = 0;
  * The segments contain an index into the points array.  We use that
  * index to find the waypoint and insert a better name for it.
  */
-void goog_segment_s(const char* args, const QXmlStreamAttributes* attrv)
+void goog_segment_s(xg_string args, const QXmlStreamAttributes* attrv)
 {
   QStringRef ptidx = attrv->value("pointIndex");
   if (!ptidx.isEmpty()) {
@@ -107,7 +107,7 @@ void goog_segment_s(const char* args, const QXmlStreamAttributes* attrv)
   }
 }
 
-void goog_segment(const char* args, const QXmlStreamAttributes* unused)
+void goog_segment(xg_string args, const QXmlStreamAttributes* unused)
 {
   waypoint* wpt_tmp;
 
@@ -119,7 +119,7 @@ void goog_segment(const char* args, const QXmlStreamAttributes* unused)
   }
 }
 
-void goog_td_s(const char* args, const QXmlStreamAttributes* attrv)
+void goog_td_s(xg_string args, const QXmlStreamAttributes* attrv)
 {
   bool isdesc = false, isseg = false;
   QStringRef aclass = attrv->value("class");
@@ -155,7 +155,7 @@ void goog_td_s(const char* args, const QXmlStreamAttributes* attrv)
   }
 }
 
-void goog_td_b(const char* args, const QXmlStreamAttributes* unused)
+void goog_td_b(xg_string args, const QXmlStreamAttributes* unused)
 {
   if (goog_segname[0] == '\\' && !strchr(args, '\xa0')) {
     if (goog_realname) {
@@ -166,7 +166,7 @@ void goog_td_b(const char* args, const QXmlStreamAttributes* unused)
     strcpy(goog_realname, args);
   }
 }
-void goog_td_e(const char* args, const QXmlStreamAttributes* unused)
+void goog_td_e(xg_string args, const QXmlStreamAttributes* unused)
 {
   if (goog_segname[0] == '\\' && goog_realname) {
     goog_segment(goog_realname, NULL/*unused*/);
@@ -200,7 +200,7 @@ static long decode_goog64(char** str)
   return result/2;
 }
 
-void goog_poly_e(const char* args, const QXmlStreamAttributes* unused)
+void goog_poly_e(xg_string args, const QXmlStreamAttributes* unused)
 {
   long lat = 0;
   long lon = 0;
diff --git a/gpsbabel/googledir.cc b/gpsbabel/googledir.cc
index 4696a95ab..48ddb34d1 100644
--- a/gpsbabel/googledir.cc
+++ b/gpsbabel/googledir.cc
@@ -51,7 +51,7 @@ xg_tag_mapping google_map[] = {
 };
 
 void
-goog_points(const char* args, const QXmlStreamAttributes* unused)
+goog_points(xg_string args, const QXmlStreamAttributes* unused)
 {
   if (args) {
     if (encoded_points) {
@@ -63,7 +63,7 @@ goog_points(const char* args, const QXmlStreamAttributes* unused)
 }
 
 void
-goog_instr(const char* args, const QXmlStreamAttributes* unused)
+goog_instr(xg_string args, const QXmlStreamAttributes* unused)
 {
   if (args) {
     if (instructions) {
@@ -100,7 +100,7 @@ decode_goog64(char** str)
 }
 
 static void
-goog_poly_e(const char* args, const QXmlStreamAttributes* unused)
+goog_poly_e(xg_string args, const QXmlStreamAttributes* unused)
 {
   long lat = 0;
   long lon = 0;
diff --git a/gpsbabel/gtrnctr.cc b/gpsbabel/gtrnctr.cc
index 27f302955..5e6d5ce85 100644
--- a/gpsbabel/gtrnctr.cc
+++ b/gpsbabel/gtrnctr.cc
@@ -451,7 +451,7 @@ gtc_trk_s(const char* unused, const QXmlStreamAttributes* unusedattrs)
 }
 
 void
-gtc_trk_ident(const char* args, const QXmlStreamAttributes* unused)
+gtc_trk_ident(xg_string args, const QXmlStreamAttributes* unused)
 {
   trk_head->rte_name = xstrdup(args);
 }
@@ -476,7 +476,7 @@ gtc_trk_pnt_s(const char* unused, const QXmlStreamAttributes* unusedattrs)
 }
 
 void
-gtc_trk_pnt_e(const char* args, const QXmlStreamAttributes* unusedd)
+gtc_trk_pnt_e(xg_string args, const QXmlStreamAttributes* unusedd)
 {
   if (wpt_tmp->longitude != 0. && wpt_tmp->latitude != 0.) {
     if (lap_s) {
@@ -499,55 +499,55 @@ gtc_trk_pnt_e(const char* args, const QXmlStreamAttributes* unusedd)
 }
 
 void
-gtc_trk_utc(const char* args, const QXmlStreamAttributes* unusedd)
+gtc_trk_utc(xg_string args, const QXmlStreamAttributes* unusedd)
 {
   wpt_tmp->creation_time = xml_parse_time(args);
 }
 
 void
-gtc_trk_lat(const char* args, const QXmlStreamAttributes* unusedd)
+gtc_trk_lat(xg_string args, const QXmlStreamAttributes* unusedd)
 {
   wpt_tmp->latitude = atof(args);
 }
 
 void
-gtc_trk_long(const char* args, const QXmlStreamAttributes* unusedd)
+gtc_trk_long(xg_string args, const QXmlStreamAttributes* unusedd)
 {
   wpt_tmp->longitude = atof(args);
 }
 
 void
-gtc_trk_alt(const char* args, const QXmlStreamAttributes* unusedd)
+gtc_trk_alt(xg_string args, const QXmlStreamAttributes* unusedd)
 {
   wpt_tmp->altitude = atof(args);
 }
 
 void
-gtc_trk_dist(const char* args, const QXmlStreamAttributes* unusedd)
+gtc_trk_dist(xg_string args, const QXmlStreamAttributes* unusedd)
 {
   wpt_tmp->odometer_distance = atof(args);
 }
 
 void
-gtc_trk_hr(const char* args, const QXmlStreamAttributes* unusedd)
+gtc_trk_hr(xg_string args, const QXmlStreamAttributes* unusedd)
 {
   wpt_tmp->heartrate = atoi(args);
 }
 
 void
-gtc_trk_cad(const char* args, const QXmlStreamAttributes* unusedd)
+gtc_trk_cad(xg_string args, const QXmlStreamAttributes* unusedd)
 {
   wpt_tmp->cadence = atoi(args);
 }
 
 void
-gtc_trk_pwr(const char* args, const QXmlStreamAttributes* unusedd)
+gtc_trk_pwr(xg_string args, const QXmlStreamAttributes* unusedd)
 {
   wpt_tmp->power = atof(args);
 }
 
 void
-gtc_trk_spd(const char* args, const QXmlStreamAttributes* unusedd)
+gtc_trk_spd(xg_string args, const QXmlStreamAttributes* unusedd)
 {
   WAYPT_SET(wpt_tmp, speed, atof(args));
 }
@@ -559,7 +559,7 @@ gtc_wpt_crs_s(const char* unused, const QXmlStreamAttributes* unusedattrs)
 }
 
 void
-gtc_wpt_crs_e(const char* args, const QXmlStreamAttributes* unusedd)
+gtc_wpt_crs_e(xg_string args, const QXmlStreamAttributes* unusedd)
 {
   if (wpt_tmp->longitude != 0. && wpt_tmp->latitude != 0.) {
     waypt_add(wpt_tmp);
@@ -578,7 +578,7 @@ gtc_wpt_pnt_s(const char* unused, const QXmlStreamAttributes* unusedattrs)
 }
 
 void
-gtc_wpt_pnt_e(const char* args, const QXmlStreamAttributes* unusedd)
+gtc_wpt_pnt_e(xg_string args, const QXmlStreamAttributes* unusedd)
 {
   if (wpt_tmp->longitude != 0. && wpt_tmp->latitude != 0.) {
     /* Add the begin position of a CourseLap as
@@ -595,7 +595,7 @@ gtc_wpt_pnt_e(const char* args, const QXmlStreamAttributes* unusedd)
 }
 
 void
-gtc_wpt_ident(const char* args, const QXmlStreamAttributes* unusedd)
+gtc_wpt_ident(xg_string args, const QXmlStreamAttributes* unusedd)
 {
   wpt_tmp->shortname = xstrdup(args);
   /* Set also as notes for compatibility with garmin usb format */
@@ -603,25 +603,25 @@ gtc_wpt_ident(const char* args, const QXmlStreamAttributes* unusedd)
 }
 
 void
-gtc_wpt_lat(const char* args, const QXmlStreamAttributes* unusedd)
+gtc_wpt_lat(xg_string args, const QXmlStreamAttributes* unusedd)
 {
   wpt_tmp->latitude = atof(args);
 }
 
 void
-gtc_wpt_long(const char* args, const QXmlStreamAttributes* unusedd)
+gtc_wpt_long(xg_string args, const QXmlStreamAttributes* unusedd)
 {
   wpt_tmp->longitude = atof(args);
 }
 
 void
-gtc_wpt_icon(const char* args, const QXmlStreamAttributes* unusedd)
+gtc_wpt_icon(xg_string args, const QXmlStreamAttributes* unusedd)
 {
   wpt_tmp->icon_descr = args;
 }
 
 void
-gtc_wpt_notes(const char* args, const QXmlStreamAttributes* unusedd)
+gtc_wpt_notes(xg_string args, const QXmlStreamAttributes* unusedd)
 {
   wpt_tmp->description = xstrdup(args);
 }
diff --git a/gpsbabel/hiketech.cc b/gpsbabel/hiketech.cc
index d3dbbd53e..27f596ab0 100644
--- a/gpsbabel/hiketech.cc
+++ b/gpsbabel/hiketech.cc
@@ -192,81 +192,81 @@ hiketech_write(void)
 }
 
 static
-void	 ht_wpt_s(const char* args, const QXmlStreamAttributes* unused)
+void	 ht_wpt_s(xg_string args, const QXmlStreamAttributes* unused)
 {
   wpt_tmp = waypt_new();
 }
 
 static
-void  	ht_ident(const char* args, const QXmlStreamAttributes* unused)
+void  	ht_ident(xg_string args, const QXmlStreamAttributes* unused)
 {
   wpt_tmp->shortname = xstrdup(args);
 }
 
 static
-void 	ht_sym(const char* args, const QXmlStreamAttributes* unused)
+void 	ht_sym(xg_string args, const QXmlStreamAttributes* unused)
 {
   wpt_tmp->icon_descr = args;
 }
 
 static
-void  	ht_lat(const char* args, const QXmlStreamAttributes* unused)
+void  	ht_lat(xg_string args, const QXmlStreamAttributes* unused)
 {
   wpt_tmp->latitude = atof(args);
 }
 
 static
-void  	ht_long(const char* args, const QXmlStreamAttributes* unused)
+void  	ht_long(xg_string args, const QXmlStreamAttributes* unused)
 {
   wpt_tmp->longitude = atof(args);
 }
 
 static
-void  	ht_alt(const char* args, const QXmlStreamAttributes* unused)
+void  	ht_alt(xg_string args, const QXmlStreamAttributes* unused)
 {
   wpt_tmp->altitude = atof(args);
 }
 
 static
-void  	ht_wpt_e(const char* args, const QXmlStreamAttributes* unused)
+void  	ht_wpt_e(xg_string args, const QXmlStreamAttributes* unused)
 {
   waypt_add(wpt_tmp);
   wpt_tmp = NULL;
 }
 
 static
-void	ht_trk_s(const char* args, const QXmlStreamAttributes* unused)
+void	ht_trk_s(xg_string args, const QXmlStreamAttributes* unused)
 {
   trk_head = route_head_alloc();
   track_add_head(trk_head);
 }
 
 static
-void	ht_trk_e(const char* args, const QXmlStreamAttributes* unused)
+void	ht_trk_e(xg_string args, const QXmlStreamAttributes* unused)
 {
 
 }
 
 static
-void	ht_trk_ident(const char* args, const QXmlStreamAttributes* unused)
+void	ht_trk_ident(xg_string args, const QXmlStreamAttributes* unused)
 {
   trk_head->rte_name = xstrdup(args);
 }
 
 static
-void	ht_trk_pnt_s(const char* args, const QXmlStreamAttributes* unused)
+void	ht_trk_pnt_s(xg_string args, const QXmlStreamAttributes* unused)
 {
   wpt_tmp = waypt_new();
 }
 
 static
-void	ht_trk_pnt_e(const char* args, const QXmlStreamAttributes* unused)
+void	ht_trk_pnt_e(xg_string args, const QXmlStreamAttributes* unused)
 {
   track_add_wpt(trk_head, wpt_tmp);
 }
 
 static
-void	ht_trk_utc(const char* args, const QXmlStreamAttributes* unused)
+void	ht_trk_utc(xg_string args, const QXmlStreamAttributes* unused)
 {
   struct tm tm;
   time_t utc;
@@ -285,19 +285,19 @@ void	ht_trk_utc(const char* args, const QXmlStreamAttributes* unused)
 }
 
 static
-void	ht_trk_lat(const char* args, const QXmlStreamAttributes* unused)
+void	ht_trk_lat(xg_string args, const QXmlStreamAttributes* unused)
 {
   wpt_tmp->latitude = atof(args);
 }
 
 static
-void	ht_trk_long(const char* args, const QXmlStreamAttributes* unused)
+void	ht_trk_long(xg_string args, const QXmlStreamAttributes* unused)
 {
   wpt_tmp->longitude = atof(args);
 }
 
 static
-void	ht_trk_alt(const char* args, const QXmlStreamAttributes* unused)
+void	ht_trk_alt(xg_string args, const QXmlStreamAttributes* unused)
 {
   wpt_tmp->altitude = atof(args);
 }
diff --git a/gpsbabel/ignrando.cc b/gpsbabel/ignrando.cc
index 52c5e3d64..3b196c366 100644
--- a/gpsbabel/ignrando.cc
+++ b/gpsbabel/ignrando.cc
@@ -81,7 +81,7 @@ static xg_callback	ignr_nb_etapes, ignr_descr;
 static xg_callback	ignr_etape_begin, ignr_etape_end;
 
 static void
-ignr_start(const char* args, const QXmlStreamAttributes* attrv)
+ignr_start(xg_string args, const QXmlStreamAttributes* attrv)
 {
   ignr_xml_error((track != NULL));
 
@@ -90,13 +90,13 @@ ignr_start(const char* args, const QXmlStreamAttributes* attrv)
 }
 
 static void
-ignr_nb_etapes(const char* args, const QXmlStreamAttributes* attrv)
+ignr_nb_etapes(xg_string args, const QXmlStreamAttributes* attrv)
 {
   xmlpoints = atoi(args);
 }
 
 static void
-ignr_descr(const char* args, const QXmlStreamAttributes* attrv)
+ignr_descr(xg_string args, const QXmlStreamAttributes* attrv)
 {
   ignr_xml_error((track == NULL));
 
@@ -106,7 +106,7 @@ ignr_descr(const char* args, const QXmlStreamAttributes* attrv)
 }
 
 static void
-ignr_etape_begin(const char* args, const QXmlStreamAttributes* attrv)
+ignr_etape_begin(xg_string args, const QXmlStreamAttributes* attrv)
 {
   ignr_xml_error((wpt != NULL));
 
@@ -114,7 +114,7 @@ ignr_etape_begin(const char* args, const QXmlStreamAttributes* attrv)
 }
 
 static void
-ignr_etape_end(const char* args, const QXmlStreamAttributes* attrv)
+ignr_etape_end(xg_string args, const QXmlStreamAttributes* attrv)
 {
   ignr_xml_error((track == NULL) || (wpt == NULL));
 
@@ -123,7 +123,7 @@ ignr_etape_end(const char* args, const QXmlStreamAttributes* attrv)
 }
 
 static void
-ignr_etape_pos(const char* args, const QXmlStreamAttributes* attrv)
+ignr_etape_pos(xg_string args, const QXmlStreamAttributes* attrv)
 {
   ignr_xml_error((wpt == NULL) || (args == NULL));
 
@@ -133,7 +133,7 @@ ignr_etape_pos(const char* args, const QXmlStreamAttributes* attrv)
 }
 
 static void
-ignr_etape_alt(const char* args, const QXmlStreamAttributes* attrv)
+ignr_etape_alt(xg_string args, const QXmlStreamAttributes* attrv)
 {
   ignr_xml_error((wpt == NULL));
   if (args == NULL) {
diff --git a/gpsbabel/ik3d.cc b/gpsbabel/ik3d.cc
index b320ecfeb..78337eef4 100644
--- a/gpsbabel/ik3d.cc
+++ b/gpsbabel/ik3d.cc
@@ -80,7 +80,7 @@ ikt_object_end(void)
 }
 
 static void
-iktobj_waypt(const char* args, const QXmlStreamAttributes* attrv)
+iktobj_waypt(xg_string args, const QXmlStreamAttributes* attrv)
 {
   if (attrv->hasAttribute("X")) {
     waypt->longitude = attrv->value("X").toString().toDouble();
@@ -91,7 +91,7 @@ iktobj_waypt(const char* args, const QXmlStreamAttributes* attrv)
 }
 
 static void
-iktobj_trkpt(const char* args, const QXmlStreamAttributes* attrv)
+iktobj_trkpt(xg_string args, const QXmlStreamAttributes* attrv)
 {
   waypt = waypt_new();
   iktobj_waypt(args, attrv);
@@ -100,19 +100,19 @@ iktobj_trkpt(const char* args, const QXmlStreamAttributes* attrv)
 }
 
 static void
-iktobj_name(const char* args, const QXmlStreamAttributes* unused)
+iktobj_name(xg_string args, const QXmlStreamAttributes* unused)
 {
   name = xstrdup(args);
 }
 
 static void
-iktobj_text(const char* args, const QXmlStreamAttributes* unused)
+iktobj_text(xg_string args, const QXmlStreamAttributes* unused)
 {
   text = xstrdup(args);
 }
 
 static void
-iktobj_type(const char* args, const QXmlStreamAttributes* unused)
+iktobj_type(xg_string args, const QXmlStreamAttributes* unused)
 {
   ikt_object_end();
 
diff --git a/gpsbabel/jogmap.cc b/gpsbabel/jogmap.cc
index 801825e2c..c3e7bfc4d 100644
--- a/gpsbabel/jogmap.cc
+++ b/gpsbabel/jogmap.cc
@@ -43,14 +43,14 @@ static arglist_t jogmap_args[] = {
 
 
 static void
-jogmap_markers(const char* args, const QXmlStreamAttributes* attrv)
+jogmap_markers(xg_string args, const QXmlStreamAttributes* attrv)
 {
   trk = route_head_alloc();
   track_add_head(trk);
 }
 
 static void
-jogmap_marker(const char* args, const QXmlStreamAttributes* attrv)
+jogmap_marker(xg_string args, const QXmlStreamAttributes* attrv)
 {
   waypoint* wpt = waypt_new();
 
diff --git a/gpsbabel/kml.cc b/gpsbabel/kml.cc
index caa51b9dc..fd52b5606 100644
--- a/gpsbabel/kml.cc
+++ b/gpsbabel/kml.cc
@@ -270,13 +270,13 @@ const char* kml_tags_to_ignore[] = {
   NULL,
 };
 
-void wpt_s(const char* args, const QXmlStreamAttributes* unused)
+void wpt_s(xg_string args, const QXmlStreamAttributes* unused)
 {
   wpt_tmp = waypt_new();
   wpt_tmp_queued = 0;
 }
 
-void wpt_e(const char* args, const QXmlStreamAttributes* unused)
+void wpt_e(xg_string args, const QXmlStreamAttributes* unused)
 {
   if (wpt_tmp_queued) {
     waypt_add(wpt_tmp);
@@ -286,14 +286,14 @@ void wpt_e(const char* args, const QXmlStreamAttributes* unused)
   wpt_tmp_queued = 0;
 }
 
-void wpt_name(const char* args, const QXmlStreamAttributes* unused)
+void wpt_name(xg_string args, const QXmlStreamAttributes* unused)
 {
   if (args) {
     wpt_tmp->shortname = xstrdup(args);
   }
 }
 
-void wpt_desc(const char* args, const QXmlStreamAttributes* unused)
+void wpt_desc(xg_string args, const QXmlStreamAttributes* unused)
 {
   if (args) {
     char* tmp, *c;
@@ -307,12 +307,12 @@ void wpt_desc(const char* args, const QXmlStreamAttributes* unused)
   }
 }
 
-void wpt_time(const char* args, const QXmlStreamAttributes* unused)
+void wpt_time(xg_string args, const QXmlStreamAttributes* unused)
 {
   wpt_tmp->SetCreationTime(xml_parse_time(args));
 }
 
-void wpt_coord(const char* args, const QXmlStreamAttributes* attrv)
+void wpt_coord(xg_string args, const QXmlStreamAttributes* attrv)
 {
   int n = 0;
   double lat, lon, alt;
@@ -328,14 +328,14 @@ void wpt_coord(const char* args, const QXmlStreamAttributes* attrv)
   wpt_tmp_queued = 1;
 }
 
-void wpt_icon(const char* args, const QXmlStreamAttributes* unused)
+void wpt_icon(xg_string args, const QXmlStreamAttributes* unused)
 {
   if (wpt_tmp)  {
     wpt_tmp->icon_descr = args;
   }
 }
 
-void trk_coord(const char* args, const QXmlStreamAttributes* attrv)
+void trk_coord(xg_string args, const QXmlStreamAttributes* attrv)
 {
   int consumed = 0;
   double lat, lon, alt;
diff --git a/gpsbabel/lmx.cc b/gpsbabel/lmx.cc
index 9b0e83fbc..c0953f70d 100644
--- a/gpsbabel/lmx.cc
+++ b/gpsbabel/lmx.cc
@@ -336,67 +336,67 @@ lmx_rd_deinit(void)
 
 
 static void
-lmx_lm_start(const char* args, const QXmlStreamAttributes* unused)
+lmx_lm_start(xg_string args, const QXmlStreamAttributes* unused)
 {
   wpt_tmp = waypt_new();
 }
 
 static void
-lmx_lm_end(const char* args, const QXmlStreamAttributes* unused)
+lmx_lm_end(xg_string args, const QXmlStreamAttributes* unused)
 {
   waypt_add(wpt_tmp);
 }
 
 static void
-lmx_lm_lat(const char* args, const QXmlStreamAttributes* unused)
+lmx_lm_lat(xg_string args, const QXmlStreamAttributes* unused)
 {
   wpt_tmp->latitude = atof(args);
 }
 
 static void
-lmx_lm_lon(const char* args, const QXmlStreamAttributes* unused)
+lmx_lm_lon(xg_string args, const QXmlStreamAttributes* unused)
 {
   wpt_tmp->longitude = atof(args);
 }
 
 static void
-lmx_lm_alt(const char* args, const QXmlStreamAttributes* unused)
+lmx_lm_alt(xg_string args, const QXmlStreamAttributes* unused)
 {
   wpt_tmp->altitude = atof(args);
 }
 
 static void
-lmx_lm_name(const char* args, const QXmlStreamAttributes* unused)
+lmx_lm_name(xg_string args, const QXmlStreamAttributes* unused)
 {
   wpt_tmp->shortname = xstrdup(args);
 }
 
 static void
-lmx_lm_desc(const char* args, const QXmlStreamAttributes* unused)
+lmx_lm_desc(xg_string args, const QXmlStreamAttributes* unused)
 {
   wpt_tmp->description = xstrdup(args);
 }
 
 static void
-lmx_lm_mlink_s(const char* args, const QXmlStreamAttributes* unused)
+lmx_lm_mlink_s(xg_string args, const QXmlStreamAttributes* unused)
 {
   urllink = urllinkt = QString();
 }
 
 static void
-lmx_lm_link(const char* args, const QXmlStreamAttributes* unused)
+lmx_lm_link(xg_string args, const QXmlStreamAttributes* unused)
 {
   urllink = args;
 }
 
 static void
-lmx_lm_linkt(const char* args, const QXmlStreamAttributes* unused)
+lmx_lm_linkt(xg_string args, const QXmlStreamAttributes* unused)
 {
   urllinkt = args;
 }
 
 static void
-lmx_lm_mlink_e(const char* args, const QXmlStreamAttributes* unused)
+lmx_lm_mlink_e(xg_string args, const QXmlStreamAttributes* unused)
 {
   waypt_add_url(wpt_tmp, urllink, urllinkt);
 }
diff --git a/gpsbabel/osm.cc b/gpsbabel/osm.cc
index 92c374015..a8f33936c 100644
--- a/gpsbabel/osm.cc
+++ b/gpsbabel/osm.cc
@@ -466,7 +466,7 @@ osm_strip_html(const char* str)
 
 
 static void
-osm_node_end(const char* args, const QXmlStreamAttributes* unused)
+osm_node_end(xg_string args, const QXmlStreamAttributes* unused)
 {
   if (wpt) {
     if (wpt->wpt_flags.fmt_use) {
@@ -480,7 +480,7 @@ osm_node_end(const char* args, const QXmlStreamAttributes* unused)
 
 
 static void
-osm_node(const char* args, const QXmlStreamAttributes* attrv)
+osm_node(xg_string args, const QXmlStreamAttributes* attrv)
 {
   wpt = waypt_new();
 
@@ -513,7 +513,7 @@ osm_node(const char* args, const QXmlStreamAttributes* attrv)
 
 
 static void
-osm_node_tag(const char* args, const QXmlStreamAttributes* attrv)
+osm_node_tag(xg_string args, const QXmlStreamAttributes* attrv)
 {
   QByteArray qkey, qvalue;
   const char* key = "", *value = "";
@@ -582,7 +582,7 @@ osm_node_tag(const char* args, const QXmlStreamAttributes* attrv)
 
 
 static void
-osm_way(const char* args, const QXmlStreamAttributes* attrv)
+osm_way(xg_string args, const QXmlStreamAttributes* attrv)
 {
   rte = route_head_alloc();
 
@@ -593,7 +593,7 @@ osm_way(const char* args, const QXmlStreamAttributes* attrv)
 }
 
 static void
-osm_way_nd(const char* args, const QXmlStreamAttributes* attrv)
+osm_way_nd(xg_string args, const QXmlStreamAttributes* attrv)
 {
   if (attrv->hasAttribute("ref")) {
     QString atstr = attrv->value("ref").toString();
@@ -611,7 +611,7 @@ osm_way_nd(const char* args, const QXmlStreamAttributes* attrv)
 }
 
 static void
-osm_way_tag(const char* args, const QXmlStreamAttributes* attrv)
+osm_way_tag(xg_string args, const QXmlStreamAttributes* attrv)
 {
   QByteArray qkey, qvalue;
   const char* key = "", *value = "";
@@ -643,7 +643,7 @@ osm_way_tag(const char* args, const QXmlStreamAttributes* attrv)
 }
 
 static void
-osm_way_end(const char* args, const QXmlStreamAttributes* unused)
+osm_way_end(xg_string args, const QXmlStreamAttributes* unused)
 {
   if (rte) {
     route_add_head(rte);
diff --git a/gpsbabel/pocketfms_fp.cc b/gpsbabel/pocketfms_fp.cc
index 814a5da72..a90436d47 100644
--- a/gpsbabel/pocketfms_fp.cc
+++ b/gpsbabel/pocketfms_fp.cc
@@ -85,7 +85,7 @@ wr_init(const char* fname)
   fatal("Writing file of type %s is not supported\n", MYNAME);
 }
 
-void	wpt_s(const char* args, const QXmlStreamAttributes* unused)
+void	wpt_s(xg_string args, const QXmlStreamAttributes* unused)
 {
   if (isFirst == 1) {
     wpt_from = waypt_new();
@@ -96,7 +96,7 @@ void	wpt_s(const char* args, const QXmlStreamAttributes* unused)
   wpt_to = waypt_new();
 }
 
-void	wpt_e(const char* args, const QXmlStreamAttributes* unused)
+void	wpt_e(xg_string args, const QXmlStreamAttributes* unused)
 {
   if (isFirst == 1) {
     route_add_wpt(route, wpt_from);
@@ -113,55 +113,55 @@ void	wpt_e(const char* args, const QXmlStreamAttributes* unused)
   wpt_to = NULL;
 }
 
-void	wpt_from_lat(const char* args, const QXmlStreamAttributes* unused)
+void	wpt_from_lat(xg_string args, const QXmlStreamAttributes* unused)
 {
   if (wpt_from != NULL) {
     wpt_from->latitude = atof(args);
   }
 }
 
-void	wpt_from_lon(const char* args, const QXmlStreamAttributes* unused)
+void	wpt_from_lon(xg_string args, const QXmlStreamAttributes* unused)
 {
   if (wpt_from != NULL) {
     wpt_from->longitude = atof(args);
   }
 }
 
-void	wpt_from_name(const char* args, const QXmlStreamAttributes* unused)
+void	wpt_from_name(xg_string args, const QXmlStreamAttributes* unused)
 {
   if (wpt_from != NULL) {
     wpt_from->shortname = xstrappend(wpt_from->shortname, args);
   }
 }
 
-void	wpt_from_elev(const char* args, const QXmlStreamAttributes* unused)
+void	wpt_from_elev(xg_string args, const QXmlStreamAttributes* unused)
 {
   if (wpt_from != NULL) {
     wpt_from->altitude = FEET_TO_METERS(atof(args));
   }
 }
 
-void	wpt_to_lat(const char* args, const QXmlStreamAttributes* unused)
+void	wpt_to_lat(xg_string args, const QXmlStreamAttributes* unused)
 {
   wpt_to->latitude = atof(args);
 }
 
-void	wpt_to_lon(const char* args, const QXmlStreamAttributes* unused)
+void	wpt_to_lon(xg_string args, const QXmlStreamAttributes* unused)
 {
   wpt_to->longitude = atof(args);
 }
 
-void	wpt_to_name(const char* args, const QXmlStreamAttributes* unused)
+void	wpt_to_name(xg_string args, const QXmlStreamAttributes* unused)
 {
   wpt_to->shortname = xstrappend(wpt_to->shortname, args);
 }
 
-void	wpt_to_elev(const char* args, const QXmlStreamAttributes* unused)
+void	wpt_to_elev(xg_string args, const QXmlStreamAttributes* unused)
 {
   dest_altitude = FEET_TO_METERS(atof(args));
 }
 
-void	wpt_altitude(const char* args, const QXmlStreamAttributes* attrv)
+void	wpt_altitude(xg_string args, const QXmlStreamAttributes* attrv)
 {
   int isFeet = 0;
 
diff --git a/gpsbabel/tef_xml.cc b/gpsbabel/tef_xml.cc
index 44d0a8a59..3215f78f5 100644
--- a/gpsbabel/tef_xml.cc
+++ b/gpsbabel/tef_xml.cc
@@ -74,7 +74,7 @@ xg_tag_mapping tef_xml_map[] = {
  */
 
 void
-tef_start(const char* args, const QXmlStreamAttributes* attrv)
+tef_start(xg_string args, const QXmlStreamAttributes* attrv)
 {
   bool valid = false;
 
@@ -98,7 +98,7 @@ tef_start(const char* args, const QXmlStreamAttributes* attrv)
  */
 
 static void
-tef_header(const char* args, const QXmlStreamAttributes* attrv)
+tef_header(xg_string args, const QXmlStreamAttributes* attrv)
 {
   route = route_head_alloc();
   foreach(QXmlStreamAttribute attr, *attrv) {
@@ -112,7 +112,7 @@ tef_header(const char* args, const QXmlStreamAttributes* attrv)
 }
 
 static void
-tef_list_start(const char* args, const QXmlStreamAttributes* attrv)
+tef_list_start(xg_string args, const QXmlStreamAttributes* attrv)
 {
   if (attrv->hasAttribute("ItemCount")) {
     item_count = attrv->value("ItemCount").toString().toUInt();
@@ -199,13 +199,13 @@ waypoint_final()
 }
 
 static void
-tef_item_end(const char* args, const QXmlStreamAttributes* unused)
+tef_item_end(xg_string args, const QXmlStreamAttributes* unused)
 {
   waypoint_final();
 }
 
 static void
-tef_list_end(const char* args, const QXmlStreamAttributes* unused)
+tef_list_end(xg_string args, const QXmlStreamAttributes* unused)
 {
   waypoint_final();
   if (waypoints != item_count)
@@ -214,7 +214,7 @@ tef_list_end(const char* args, const QXmlStreamAttributes* unused)
 }
 
 static void
-tef_item_start(const char* args, const QXmlStreamAttributes* attrv)
+tef_item_start(xg_string args, const QXmlStreamAttributes* attrv)
 {
   waypoints++;
 
@@ -262,7 +262,7 @@ tef_read_comma_float(const QStringRef& value)
 }
 
 static void
-tef_point(const char* args, const QXmlStreamAttributes* attrv)
+tef_point(xg_string args, const QXmlStreamAttributes* attrv)
 {
   if (!wpt_tmp) {
     return;
diff --git a/gpsbabel/wfff_xml.cc b/gpsbabel/wfff_xml.cc
index 4e57e5c81..8afe9e349 100644
--- a/gpsbabel/wfff_xml.cc
+++ b/gpsbabel/wfff_xml.cc
@@ -97,7 +97,7 @@ static double	ap_lat		=0.0;
 static double	ap_lon		=0.0;
 
 /*	Start of AP block */
-void wfff_s(const char* args, const QXmlStreamAttributes* unused)
+void wfff_s(xg_string args, const QXmlStreamAttributes* unused)
 {
   xfreez(ap_mac);
   xfreez(ap_ssid);
@@ -114,84 +114,84 @@ void wfff_s(const char* args, const QXmlStreamAttributes* unused)
   ap_lon=0.0;
 }
 
-void wfff_mac(const char* args, const QXmlStreamAttributes* unused)
+void wfff_mac(xg_string args, const QXmlStreamAttributes* unused)
 {
   if (args) {
     ap_mac = xstrdup(args);
   }
 }
 
-void wfff_ssid(const char* args, const QXmlStreamAttributes* unused)
+void wfff_ssid(xg_string args, const QXmlStreamAttributes* unused)
 {
   if (args) {
     ap_ssid = xstrdup(args);
   }
 }
 
-void wfff_type(const char* args, const QXmlStreamAttributes* unused)
+void wfff_type(xg_string args, const QXmlStreamAttributes* unused)
 {
   if (args) {
     ap_type = xstrdup(args);
   }
 }
 
-void wfff_mnrssi(const char* args, const QXmlStreamAttributes* unused)
+void wfff_mnrssi(xg_string args, const QXmlStreamAttributes* unused)
 {
   if (args) {
     ap_mnrssi = atof(args);
   }
 }
 
-void wfff_mxrssi(const char* args, const QXmlStreamAttributes* unused)
+void wfff_mxrssi(xg_string args, const QXmlStreamAttributes* unused)
 {
   if (args) {
     ap_mxrssi = atof(args);
   }
 }
 
-void wfff_chan(const char* args, const QXmlStreamAttributes* unused)
+void wfff_chan(xg_string args, const QXmlStreamAttributes* unused)
 {
   if (args) {
     ap_chan = atoi(args);
   }
 }
 
-void wfff_first(const char* args, const QXmlStreamAttributes* unused)
+void wfff_first(xg_string args, const QXmlStreamAttributes* unused)
 {
   if (args) {
     ap_first = xml_parse_time(args).toTime_t();
   }
 }
 
-void wfff_last(const char* args, const QXmlStreamAttributes* unused)
+void wfff_last(xg_string args, const QXmlStreamAttributes* unused)
 {
   if (args) {
     ap_last = xstrdup(args);
   }
 }
 
-void wfff_wep(const char* args, const QXmlStreamAttributes* unused)
+void wfff_wep(xg_string args, const QXmlStreamAttributes* unused)
 {
   if (args) {
     ap_wep = xstrdup(args);
   }
 }
 
-void wfff_hdop(const char* args, const QXmlStreamAttributes* unused)
+void wfff_hdop(xg_string args, const QXmlStreamAttributes* unused)
 {
   if (args) {
     ap_hdop = atof(args);
   }
 }
 
-void wfff_lat(const char* args, const QXmlStreamAttributes* unused)
+void wfff_lat(xg_string args, const QXmlStreamAttributes* unused)
 {
   if (args) {
     ap_lat = atof(args);
   }
 }
 
-void wfff_lon(const char* args, const QXmlStreamAttributes* unused)
+void wfff_lon(xg_string args, const QXmlStreamAttributes* unused)
 {
   if (args) {
     ap_lon = atof(args);
@@ -201,7 +201,7 @@ void wfff_lon(const char* args, const QXmlStreamAttributes* unused)
 /*	End of AP Block, set waypoint and add */
 static long tosscount=0;
 
-void wfff_e(const char* args, const QXmlStreamAttributes* unused)
+void wfff_e(xg_string args, const QXmlStreamAttributes* unused)
 {
   waypoint*	wpt_tmp		=0;
   char		desc[255]	="\0";
diff --git a/gpsbabel/xmlgeneric.h b/gpsbabel/xmlgeneric.h
index 5bc1b76a7..784a5f5d2 100644
--- a/gpsbabel/xmlgeneric.h
+++ b/gpsbabel/xmlgeneric.h
@@ -27,7 +27,7 @@ typedef enum {
   cb_end,
 } xg_cb_type;
 
-typedef void (xg_callback)(const char*, const QXmlStreamAttributes*);
+typedef void (xg_callback)(xg_string, const QXmlStreamAttributes*);
 
 typedef struct xg_tag_mapping {
   xg_callback* tag_cb;
diff --git a/gpsbabel/xol.cc b/gpsbabel/xol.cc
index 7e054628a..702f50f03 100644
--- a/gpsbabel/xol.cc
+++ b/gpsbabel/xol.cc
@@ -56,7 +56,7 @@ xg_tag_mapping xol_map[] = {
 
 
 static void
-xol_overlay(const char* args, const QXmlStreamAttributes* attrv)
+xol_overlay(xg_string args, const QXmlStreamAttributes* attrv)
 {
   if (attrv->hasAttribute("version")) {
     if (attrv->value("version") != "1.0") {
@@ -67,7 +67,7 @@ xol_overlay(const char* args, const QXmlStreamAttributes* attrv)
 }
 
 static void
-xol_shape(const char* args, const QXmlStreamAttributes* attrv)
+xol_shape(xg_string args, const QXmlStreamAttributes* attrv)
 {
   if (attrv->hasAttribute("type")) {
     if (attrv->value("type") == "waypoint") {
@@ -106,7 +106,7 @@ xol_shape(const char* args, const QXmlStreamAttributes* attrv)
 }
 
 static void
-xol_shape_end(const char* args, const QXmlStreamAttributes* unused)
+xol_shape_end(xg_string args, const QXmlStreamAttributes* unused)
 {
   if (wpt) {
     if (trk) {
@@ -124,7 +124,7 @@ xol_shape_end(const char* args, const QXmlStreamAttributes* unused)
 }
 
 static void
-xol_waypt(const char* args, const QXmlStreamAttributes* attrv)
+xol_waypt(xg_string args, const QXmlStreamAttributes* attrv)
 {
   int x=0, y=0;
 
diff --git a/gpsbabel/yahoo.cc b/gpsbabel/yahoo.cc
index b60b8dd66..5aa566b4d 100644
--- a/gpsbabel/yahoo.cc
+++ b/gpsbabel/yahoo.cc
@@ -79,28 +79,28 @@ yahoo_wr_init(const char* fname)
   fatal("Writing file of type %s is not supported\n", MYNAME);
 }
 
-void	wpt_s(const char* args, const QXmlStreamAttributes* unused)
+void	wpt_s(xg_string args, const QXmlStreamAttributes* unused)
 {
   wpt_tmp = waypt_new();
 }
 
-void	wpt_e(const char* args, const QXmlStreamAttributes* unused)
+void	wpt_e(xg_string args, const QXmlStreamAttributes* unused)
 {
   waypt_add(wpt_tmp);
   wpt_tmp = NULL;
 }
 
-void	wpt_lat(const char* args, const QXmlStreamAttributes* unused)
+void	wpt_lat(xg_string args, const QXmlStreamAttributes* unused)
 {
   wpt_tmp->latitude = atof(args);
 }
 
-void	wpt_lon(const char* args, const QXmlStreamAttributes* unused)
+void	wpt_lon(xg_string args, const QXmlStreamAttributes* unused)
 {
   wpt_tmp->longitude = atof(args);
 }
 
-void	wpt_addr(const char* args, const QXmlStreamAttributes* unused)
+void	wpt_addr(xg_string args, const QXmlStreamAttributes* unused)
 {
   if (wpt_tmp->notes) {
     wpt_tmp->notes = xstrappend(wpt_tmp->notes, as);
-- 
2.30.2